129. Araxis Merge File Comparison Report

Produced by Araxis Merge on 2021-07-21 10:22:01 +0000. See www.araxis.com for information about Merge. This report uses XHTML and CSS2, and is best viewed with a modern standards-compliant browser. For optimum results when printing this report, use landscape orientation and enable printing of background images and colours in your browser.

129.1 Files compared

#	Location	File	Last Modified
1	/Applications/Ampps/www/Porto v4.0.0/Theme Files/Magento 2.x/Porto Theme/app/design/frontend/Smartwave/porto/Smartwave_Porto	requirejs-config.js	2021-04-13 15:52:44 +0000
2	/Applications/Ampps/www/Porto v4.0.1/Theme Files/Magento 2.x/Porto Theme/app/design/frontend/Smartwave/porto/Smartwave_Porto	requirejs-config.js	2021-06-30 04:25:08 +0000

129.2 Comparison summary

Description	Between Files 1 and 2
Description	Text Blocks	Lines
Unchanged	3	18
Changed	2	8
Inserted	0	0
Removed	0	0

129.3 Comparison options

Whitespace	Consecutive whitespace is treated as a single space
Character case	Differences in character case are significant
Line endings	Differences in line endings (`CR` and `LF` characters) are ignored
CR/LF characters	Not shown in the comparison detail
Active line-pairing rules

129.4 Active regular expressions

No regular expressions were active.

129.5 Comparison detail

1	var config = {	1	var config = {
2	paths: {	2	paths: {
3	'imagesloaded': 'Smartwave_Porto/js/imagesloaded',	3	'imagesloaded': 'Smartwave_Porto/js/imagesloaded',
4	'packery': 'Smartwave_Porto/js/packery.pkgd'	4	'packery': 'Smartwave_Porto/js/packery.pkgd',
		5	'themeSticky': 'js/jquery.sticky.min'
5	},	6	},
6	shim: {	7	shim: {
7	'packery': {	8	'packery': {
8	deps: ['jquery','imagesloaded']	9	deps: ['jquery','imagesloaded']
9	}	10	},
		11	'themeSticky': {
		12	deps: ['jquery']
		13	}
10	}	14	}
11	};	15	};